Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Thu, 21 Dec 2017 14:54:10 +0000 (09:54 -0500)
committerTom Rini <[email protected]>
Thu, 21 Dec 2017 14:54:10 +0000 (09:54 -0500)

Trivial merge